From 1679210e08231048546f79c7a50e789426d504cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adolfo=20Ochagav=C3=ADa?= Date: Sat, 23 Aug 2014 21:06:04 +0200 Subject: [PATCH] Use `mod` where possible Example: ``` use std::fmt; use std::fmt::Show; ``` becomes ``` use std::fmt::{mod, Show}; ``` --- src/cargo/core/errors.rs | 3 +-- src/cargo/core/manifest.rs | 3 +-- src/cargo/core/package.rs | 3 +-- src/cargo/core/package_id.rs | 3 +-- src/cargo/core/shell.rs | 3 +-- src/cargo/core/source.rs | 3 +-- src/cargo/lib.rs | 3 +-- src/cargo/ops/cargo_compile.rs | 6 ++---- src/cargo/ops/cargo_generate_lockfile.rs | 3 +-- src/cargo/ops/cargo_new.rs | 3 +-- src/cargo/ops/cargo_read_manifest.rs | 3 +-- src/cargo/ops/cargo_rustc/context.rs | 3 +-- src/cargo/ops/cargo_rustc/layout.rs | 3 +-- src/cargo/sources/git/source.rs | 3 +-- src/cargo/sources/git/utils.rs | 3 +-- src/cargo/sources/path.rs | 3 +-- src/cargo/util/errors.rs | 3 +-- src/cargo/util/process_builder.rs | 3 +-- src/cargo/util/to_url.rs | 3 +-- 19 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/cargo/core/errors.rs b/src/cargo/core/errors.rs index 695ecba9d..33dd5bbe2 100644 --- a/src/cargo/core/errors.rs +++ b/src/cargo/core/errors.rs @@ -1,5 +1,4 @@ -use std::fmt; -use std::fmt::{Show,Formatter}; +use std::fmt::{mod, Show, Formatter}; use std::io::IoError; /* diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs index 6d7fe2dd2..fe590f119 100644 --- a/src/cargo/core/manifest.rs +++ b/src/cargo/core/manifest.rs @@ -1,7 +1,6 @@ use std::hash; use std::result; -use std::fmt; -use std::fmt::{Show,Formatter}; +use std::fmt::{mod, Show, Formatter}; use semver::Version; use serialize::{Encoder,Encodable}; use core::source::SourceId; diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index 516866d3c..0ae1b4be7 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -1,5 +1,4 @@ -use std::fmt::{Show,Formatter}; -use std::fmt; +use std::fmt::{mod, Show, Formatter}; use std::slice; use semver::Version; diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs index 8f7f9933a..6f70ad353 100644 --- a/src/cargo/core/package_id.rs +++ b/src/cargo/core/package_id.rs @@ -1,7 +1,6 @@ use semver; use std::hash::Hash; -use std::fmt; -use std::fmt::{Show,Formatter}; +use std::fmt::{mod, Show, Formatter}; use collections::hash; use serialize::{ Encodable, diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs index 5d98b4c90..5e93c0cb4 100644 --- a/src/cargo/core/shell.rs +++ b/src/cargo/core/shell.rs @@ -1,5 +1,4 @@ -use term; -use term::{Terminal,color}; +use term::{mod, Terminal, color}; use term::color::{Color, BLACK, RED, GREEN, YELLOW}; use term::attr::{Attr, Bold}; use std::io::{IoResult, stderr}; diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs index ae415e130..69767edc4 100644 --- a/src/cargo/core/source.rs +++ b/src/cargo/core/source.rs @@ -1,8 +1,7 @@ use std::cmp::Ordering; use std::collections::HashMap; use std::collections::hashmap::{Values, MutEntries}; -use std::fmt::{Show, Formatter}; -use std::fmt; +use std::fmt::{mod, Show, Formatter}; use std::hash; use std::iter; use std::mem; diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index 482872b4d..db4e6912e 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -23,8 +23,7 @@ extern crate toml; use std::os; use std::io::stdio::{stdout_raw, stderr_raw}; -use std::io::{stdout, stderr}; -use std::io; +use std::io::{mod, stdout, stderr}; use serialize::{Decoder, Encoder, Decodable, Encodable, json}; use docopt::FlagParser; diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index d7c44c19e..1c35a0f2e 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -28,13 +28,11 @@ use std::result; use core::registry::PackageRegistry; use core::{MultiShell, Source, SourceId, PackageSet, Target, PackageId}; -use core::{Package, Summary, Resolve}; -use core::resolver; +use core::{Package, Summary, Resolve, resolver}; use ops; use sources::{PathSource}; use util::config::{Config, ConfigValue}; -use util::{CargoResult, Wrap, config, internal, human, ChainError}; -use util::profile; +use util::{CargoResult, Wrap, config, internal, human, ChainError, profile}; pub struct CompileOptions<'a> { pub update: bool, diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index 1e10f53d3..4875034d1 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -3,8 +3,7 @@ use std::collections::HashSet; use std::io::File; use serialize::{Encodable, Decodable}; -use toml::Encoder; -use toml as toml; +use toml::{mod, Encoder}; use core::registry::PackageRegistry; use core::{MultiShell, Source, Resolve, resolver, Package, SourceId}; diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index c9f1ccdf0..53b462ae2 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -1,6 +1,5 @@ use std::os; -use std::io; -use std::io::{fs, File}; +use std::io::{mod, fs, File}; use util::{CargoResult, human, ChainError, process}; use core::shell::MultiShell; diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs index e25e108b7..a3799957a 100644 --- a/src/cargo/ops/cargo_read_manifest.rs +++ b/src/cargo/ops/cargo_read_manifest.rs @@ -1,8 +1,7 @@ use std::collections::HashSet; use std::io::{File, fs}; -use util; use core::{Package,Manifest,SourceId}; -use util::{CargoResult, human}; +use util::{mod, CargoResult, human}; use util::important_paths::find_project_manifest_exact; use util::toml::{Layout, project_layout}; diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index 45bc56b37..360afb88f 100644 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -3,8 +3,7 @@ use std::str; use semver::Version; use core::{SourceMap, Package, PackageId, PackageSet, Resolve, Target}; -use util; -use util::{CargoResult, ChainError, internal, Config, profile, Require}; +use util::{mod, CargoResult, ChainError, internal, Config, profile, Require}; use super::{Kind, KindPlugin, KindTarget, Compilation}; use super::layout::{Layout, LayoutProxy}; diff --git a/src/cargo/ops/cargo_rustc/layout.rs b/src/cargo/ops/cargo_rustc/layout.rs index fdca3fec5..0e612f33d 100644 --- a/src/cargo/ops/cargo_rustc/layout.rs +++ b/src/cargo/ops/cargo_rustc/layout.rs @@ -46,8 +46,7 @@ //! old-fingerprint/ //! ``` -use std::io; -use std::io::{fs, IoResult}; +use std::io::{mod, fs, IoResult}; use core::Package; use util::hex::short_hash; diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index 0fa87f2bb..4d589d62c 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -1,5 +1,4 @@ -use std::fmt::{Show,Formatter}; -use std::fmt; +use std::fmt::{mod, Show, Formatter}; use std::hash::Hasher; use std::hash::sip::SipHasher; use std::mem; diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs index b92517514..b673d631d 100644 --- a/src/cargo/sources/git/utils.rs +++ b/src/cargo/sources/git/utils.rs @@ -1,5 +1,4 @@ -use std::fmt; -use std::fmt::{Show,Formatter}; +use std::fmt::{mod, Show, Formatter}; use std::io::{UserDir}; use std::io::fs::{mkdir_recursive,rmdir_recursive}; use serialize::{Encodable,Encoder}; diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 0ef3484f9..a81ea31aa 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -1,6 +1,5 @@ use std::cmp; -use std::fmt::{Show, Formatter}; -use std::fmt; +use std::fmt::{mod, Show, Formatter}; use std::io::fs; use glob::Pattern; diff --git a/src/cargo/util/errors.rs b/src/cargo/util/errors.rs index a3ad366b8..5ec2f711c 100644 --- a/src/cargo/util/errors.rs +++ b/src/cargo/util/errors.rs @@ -1,7 +1,6 @@ use std::io::process::{ProcessOutput, ProcessExit, ExitStatus, ExitSignal}; use std::io::IoError; -use std::fmt; -use std::fmt::{Show, Formatter, FormatError}; +use std::fmt::{mod, Show, Formatter, FormatError}; use std::str; use docopt; diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index da88b33f4..46a020b8f 100644 --- a/src/cargo/util/process_builder.rs +++ b/src/cargo/util/process_builder.rs @@ -1,5 +1,4 @@ -use std::fmt; -use std::fmt::{Show, Formatter}; +use std::fmt::{mod, Show, Formatter}; use std::os; use std::c_str::CString; use std::io::process::{Command, ProcessOutput, InheritFd}; diff --git a/src/cargo/util/to_url.rs b/src/cargo/util/to_url.rs index d130daa72..93df2b30c 100644 --- a/src/cargo/util/to_url.rs +++ b/src/cargo/util/to_url.rs @@ -1,5 +1,4 @@ -use url; -use url::{Url, UrlParser}; +use url::{mod, Url, UrlParser}; pub trait ToUrl { fn to_url(self) -> Result; -- 2.30.2